Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 14:31:59 +0000 (07:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 14:31:59 +0000 (07:31 -0700)

Trivial merge